From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Tue, 3 Jan 2012 19:41:14 +0000 (+0100)
Subject: * mail/smtpmail.el (smtpmail-stream-type): Mention the `ssl' value.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1279
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=061d00ec7c8297632c7ad33ca1c0dcc9c959dc92;p=emacs.git

* mail/smtpmail.el (smtpmail-stream-type): Mention the `ssl' value.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b3ce02088e1..b7d0468af65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* mail/smtpmail.el (smtpmail-stream-type): Mention the `ssl' value.
+
 2012-01-03  Chong Yidong  <cyd@gnu.org>
 
 	* shell.el (shell-dynamic-complete-functions): Put
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index bc38b10124e..4946b4e5cd3 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -103,12 +103,14 @@ don't define this value."
   "Connection type SMTP connections.
 This may be either nil (possibly upgraded to STARTTLS if
 possible), or `starttls' (refuse to send if STARTTLS isn't
-available), or `plain' (never use STARTTLS).."
+available), or `plain' (never use STARTTLS), or `ssl' (to use
+TLS/SSL)."
   :version "24.1"
   :group 'smtpmail
   :type '(choice (const :tag "Possibly upgrade to STARTTLS" nil)
 		 (const :tag "Always use STARTTLS" starttls)
-		 (const :tag "Never use STARTTLS" plain)))
+		 (const :tag "Never use STARTTLS" plain)
+		 (const :tag "Use TLS/SSL" ssl)))
 
 (defcustom smtpmail-sendto-domain nil
   "Local domain name without a host name.